Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7521d9771ea
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb22e5ae4585
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 4, 2015

  1. movenc: Enable editlists by default if delay_moov is enabled

    Being able to write editlists properly is one of the main points
    in the delay_moov flag.
    
    Signed-off-by: Martin Storsjö <martin@martin.st>
    mstorsjo committed Jan 4, 2015
    Copy the full SHA
    46808fd View commit details

Commits on Jan 5, 2015

  1. Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'

    * commit '46808fdf04ab113df374157b90b506eb3110daf2':
      movenc: Enable editlists by default if delay_moov is enabled
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Jan 5, 2015
    Copy the full SHA
    fb22e5a View commit details
Showing with 2 additions and 2 deletions.
  1. +0 −1 libavformat/dashenc.c
  2. +2 −1 libavformat/movenc.c
1 change: 0 additions & 1 deletion libavformat/dashenc.c
Original file line number Diff line number Diff line change
@@ -629,7 +629,6 @@ static int dash_write_header(AVFormatContext *s)
os->init_start_pos = 0;

av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
av_dict_set(&opts, "use_editlist", "1", 0);
if ((ret = avformat_write_header(ctx, &opts)) < 0) {
goto fail;
}
3 changes: 2 additions & 1 deletion libavformat/movenc.c
Original file line number Diff line number Diff line change
@@ -4651,7 +4651,8 @@ static int mov_write_header(AVFormatContext *s)

if (mov->use_editlist < 0) {
mov->use_editlist = 1;
if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
if (mov->flags & FF_MOV_FLAG_FRAGMENT &&
!(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {
// If we can avoid needing an edit list by shifting the
// tracks, prefer that over (trying to) write edit lists
// in fragmented output.